--- a/calendar/base/src/calDateTime.cpp
+++ b/calendar/base/src/calDateTime.cpp
@@ -59,39 +59,39 @@ extern "C" {
 #define CAL_ATTR_SET_PRE NS_ENSURE_FALSE(mImmutable, NS_ERROR_OBJECT_IS_IMMUTABLE)
 #define CAL_ATTR_SET_POST Normalize()
 #include "calAttributeHelpers.h"
 
 NS_IMPL_CLASSINFO(calDateTime, NULL, 0, CAL_DATETIME_CID)
 NS_IMPL_ISUPPORTS2_CI(calDateTime, calIDateTime, nsIXPCScriptable)
 
 calDateTime::calDateTime()
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     Reset();
 }
 
 calDateTime::calDateTime(icaltimetype const* atimeptr, calITimezone *tz)
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     FromIcalTime(atimeptr, tz);
 }
 
 NS_IMETHODIMP
 calDateTime::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::MakeImmutable()
 {
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::Clone(calIDateTime **aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     icaltimetype itt;
@@ -114,17 +114,17 @@ calDateTime::ResetTo(PRInt16 year,
     NS_ENSURE_FALSE(mImmutable, NS_ERROR_OBJECT_IS_IMMUTABLE);
     NS_ENSURE_ARG_POINTER(tz);
     mYear = year;
     mMonth = month;
     mDay = day;
     mHour = hour;
     mMinute = minute;
     mSecond = second;
-    mIsDate = PR_FALSE;
+    mIsDate = false;
     mTimezone = tz;
     Normalize();
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::Reset()
 {
@@ -132,20 +132,20 @@ calDateTime::Reset()
     mYear = 1970;
     mMonth = 0;
     mDay = 1;
     mHour = 0;
     mMinute = 0;
     mSecond = 0;
     mWeekday = 4;
     mYearday = 1;
-    mIsDate = PR_FALSE;
+    mIsDate = false;
     mTimezone = nsnull;
     mNativeTime = 0;
-    mIsValid = PR_TRUE;
+    mIsValid = true;
     return NS_OK;
 }
 
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Year)
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Month)
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Day)
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Hour)
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Minute)
@@ -187,17 +187,17 @@ calDateTime::GetTimezoneOffset(PRInt32 *
     *aResult = icaltimezone_get_utc_offset(const_cast<icaltimezone *>(icalt.zone), &icalt, &dst);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::SetNativeTime(PRTime aNativeTime)
 {
     icaltimetype icalt;
-    PRTimeToIcaltime(aNativeTime, PR_FALSE, icaltimezone_get_utc_timezone(), &icalt);
+    PRTimeToIcaltime(aNativeTime, false, icaltimezone_get_utc_timezone(), &icalt);
     FromIcalTime(&icalt, cal::UTC());
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::AddDuration(calIDuration *aDuration)
 {
     NS_ENSURE_FALSE(mImmutable, NS_ERROR_OBJECT_IS_IMMUTABLE);
@@ -255,17 +255,17 @@ calDateTime::ToString(nsACString & aResu
 }
 
 NS_IMETHODIMP
 calDateTime::SetTimeInTimezone(PRTime aTime, calITimezone * aTimezone)
 {
     NS_ENSURE_FALSE(mImmutable, NS_ERROR_OBJECT_IS_IMMUTABLE);
     NS_ENSURE_ARG_POINTER(aTimezone);
     icaltimetype icalt;
-    PRTimeToIcaltime(aTime, PR_FALSE, cal::getIcalTimezone(aTimezone), &icalt);
+    PRTimeToIcaltime(aTime, false, cal::getIcalTimezone(aTimezone), &icalt);
     FromIcalTime(&icalt, aTimezone);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::GetInTimezone(calITimezone * aTimezone, calIDateTime ** aResult)
 {
     NS_ENSURE_ARG_POINTER(aTimezone);
@@ -483,19 +483,19 @@ calDateTime::ToIcalTime(struct icaltimet
 //         icaltimezone_get_utc_offset(tz, icalt, &icalt->is_daylight);
 //     }
 }
 
 void calDateTime::FromIcalTime(icaltimetype const* icalt, calITimezone * tz)
 {
     icaltimetype t = *icalt;
     mIsValid = (icaltime_is_null_time(t) ||
-                icaltime_is_valid_time(t) ? PR_TRUE : PR_FALSE);
+                icaltime_is_valid_time(t) ? true : false);
 
-    mIsDate = t.is_date ? PR_TRUE : PR_FALSE;
+    mIsDate = t.is_date ? true : false;
     if (mIsDate) {
         t.hour = 0;
         t.minute = 0;
         t.second = 0;
     }
 
     if (mIsValid) {
         t = icaltime_normalize(t);
@@ -679,22 +679,22 @@ calDateTime::GetProperty(nsIXPConnectWra
             bool b;
             if (NS_SUCCEEDED(mTimezone->GetIsFloating(&b)) && b) {
                 obj = js_NewDateObject(cx, mYear, mMonth, mDay, mHour, mMinute, mSecond);
             } else {
                 obj = js_NewDateObjectMsec(cx, msec);
             }
 
             *vp = OBJECT_TO_JSVAL(obj);
-            *_retval = PR_TRUE;
+            *_retval = true;
             return NS_SUCCESS_I_DID_SOMETHING;
         }
     }
 
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }
 
 
 /* bool setProperty (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in JSValPtr vp); */
 NS_IMETHODIMP
 calDateTime::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
                          JSObject * obj, jsid id, jsval * vp, bool *_retval)
@@ -707,37 +707,37 @@ calDateTime::SetProperty(nsIXPConnectWra
         const jschar *str = JS_GetStringCharsAndLength(cx, idString, &length);
 
         nsDependentString const val(reinterpret_cast<PRUnichar const*>(str), length);
 
         if (val.EqualsLiteral("jsDate") && vp) {
             JSObject *dobj;
             if (!JSVAL_IS_OBJECT(*vp) ||
                 !js_DateIsValid(cx, (dobj = JSVAL_TO_OBJECT(*vp)))) {
-                mIsValid = PR_FALSE;
+                mIsValid = false;
             } else {
                 jsdouble utcMsec = js_DateGetMsecSinceEpoch(cx, dobj);
                 PRTime utcTime, thousands;
                 LL_F2L(utcTime, utcMsec);
                 LL_I2L(thousands, 1000);
                 LL_MUL(utcTime, utcTime, thousands);
 
                 nsresult rv = SetNativeTime(utcTime);
                 if (NS_SUCCEEDED(rv)) {
-                    mIsValid = PR_TRUE;
+                    mIsValid = true;
                 } else {
-                    mIsValid = PR_FALSE;
+                    mIsValid = false;
                 }
             }
 
-            *_retval = PR_TRUE;
+            *_retval = true;
             return NS_SUCCESS_I_DID_SOMETHING;
         }
     }
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }
 
 /* bool newResolve (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in PRUint32 flags, out JSObjectPtr objp); */
 NS_IMETHODIMP
 calDateTime::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
                         JSObject * obj, jsid id, PRUint32 flags,
                         JSObject * *objp, bool *_retval)
@@ -757,11 +757,11 @@ calDateTime::NewResolve(nsIXPConnectWrap
                                            length,
                                            JSVAL_VOID,
                                            nsnull, nsnull, 0);
             *objp = obj;
             return *_retval ? NS_OK : NS_ERROR_FAILURE;
         }
     }
 
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }

--- a/calendar/base/src/calDuration.cpp
+++ b/calendar/base/src/calDuration.cpp
@@ -51,53 +51,53 @@
 #define SECONDS_PER_DAY     86400
 #define SECONDS_PER_HOUR     3600
 #define SECONDS_PER_MINUTE     60
 
 NS_IMPL_CLASSINFO(calDuration, NULL, 0, CAL_DURATION_CID)
 NS_IMPL_ISUPPORTS1_CI(calDuration, calIDuration)
 
 calDuration::calDuration()
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     Reset();
 }
 
 calDuration::calDuration(const calDuration& cdt)
 {
     mDuration.is_neg = cdt.mDuration.is_neg;
     mDuration.weeks = cdt.mDuration.weeks;
     mDuration.days = cdt.mDuration.days;
     mDuration.hours = cdt.mDuration.hours;
     mDuration.minutes = cdt.mDuration.minutes;
     mDuration.seconds = cdt.mDuration.seconds;
 
     // copies are always mutable
-    mImmutable = PR_FALSE;
+    mImmutable = false;
 }
 
 calDuration::calDuration(const struct icaldurationtype * const aDurationPtr)
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     FromIcalDuration(aDurationPtr);
 }
 
 NS_IMETHODIMP
 calDuration::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDuration::MakeImmutable()
 {
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDuration::Clone(calIDuration **aResult)
 {
     calDuration *cdt = new calDuration(*this);
     if (!cdt)

--- a/calendar/base/src/calICSService.cpp
+++ b/calendar/base/src/calICSService.cpp
@@ -116,17 +116,17 @@ calIcalProperty::GetValue(nsACString &st
         icalstr = icalproperty_get_value_as_string(mProperty);
     }
 
     if (!icalstr) {
         if (icalerrno == ICAL_BADARG_ERROR) {
             str.Truncate();
             // Set string to null, because we don't have a value
             // (which is something different then an empty value)
-            str.SetIsVoid(PR_TRUE);
+            str.SetIsVoid(true);
             return NS_OK;
         }
 
 #ifdef DEBUG
         fprintf(stderr, "Error getting string value: %d (%s)\n",
                 icalerrno, icalerror_strerror(icalerrno));
 #endif
         return NS_ERROR_FAILURE;
@@ -162,17 +162,17 @@ NS_IMETHODIMP
 calIcalProperty::GetValueAsIcalString(nsACString &str)
 {
     const char *icalstr = icalproperty_get_value_as_string(mProperty);
     if (!icalstr) {
         if (icalerrno == ICAL_BADARG_ERROR) {
             str.Truncate();
             // Set string to null, because we don't have a value
             // (which is something different then an empty value)
-            str.SetIsVoid(PR_TRUE);
+            str.SetIsVoid(true);
             return NS_OK;
         }
 
 #ifdef DEBUG
         fprintf(stderr, "Error getting string value: %d (%s)\n",
                 icalerrno, icalerror_strerror(icalerrno));
 #endif
         return NS_ERROR_FAILURE;
@@ -242,17 +242,17 @@ calIcalProperty::GetParameter(const nsAC
             icalstr = icalparameter_get_iana_value(icalparam);
     } else {
         icalstr = icalproperty_get_parameter_as_string(mProperty,
                                                        PromiseFlatCString(param).get());
     }
 
     if (!icalstr) {
         value.Truncate();
-        value.SetIsVoid(PR_TRUE);
+        value.SetIsVoid(true);
     } else {
         value.Assign(icalstr);
     }
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calIcalProperty::SetParameter(const nsACString &param, const nsACString &value)
@@ -324,17 +324,17 @@ FillParameterName(icalparameter *icalpar
         else if (paramkind != ICAL_NO_PARAMETER)
             propname = icalparameter_kind_to_string(paramkind);
     }
 
     if (propname) {
         name.Assign(propname);
     } else {
         name.Truncate();
-        name.SetIsVoid(PR_TRUE);
+        name.SetIsVoid(true);
     }
 
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calIcalProperty::GetFirstParameterName(nsACString &name)
 {
@@ -585,17 +585,17 @@ NS_IMETHODIMP                           
 calIcalComponent::Get##Attrname(nsACString &str)                        \
 {                                                                       \
     PRInt32 val;                                                        \
     nsresult rv = GetIntProperty(ICAL_##ICALNAME##_PROPERTY, &val);     \
     if (NS_FAILED(rv))                                                  \
         return rv;                                                      \
     if (val == -1) {                                                    \
         str.Truncate();                                                 \
-        str.SetIsVoid(PR_TRUE);                                         \
+        str.SetIsVoid(true);                                         \
     } else {                                                            \
         str.Assign(icalproperty_##lcname##_to_string((icalproperty_##lcname)val)); \
     }                                                                   \
     return NS_OK;                                                       \
 }                                                                       \
                                                                         \
 NS_IMETHODIMP                                                           \
 calIcalComponent::Set##Attrname(const nsACString &str)                  \
@@ -681,17 +681,17 @@ calIcalComponent::Set##Attrname(PRInt32 
     return SetProperty(ICAL_##ICALNAME##_PROPERTY, prop);       \
 }
 
 nsresult calIcalComponent::GetStringProperty(icalproperty_kind kind, nsACString &str)
 {
     icalproperty *prop = icalcomponent_get_first_property(mComponent, kind);
     if (!prop) {
         str.Truncate();
-        str.SetIsVoid(PR_TRUE);
+        str.SetIsVoid(true);
     } else {
         str.Assign(icalvalue_get_string(icalproperty_get_value(prop)));
     }
     return NS_OK;
 }
 
 nsresult calIcalComponent::SetStringProperty(icalproperty_kind kind,
                                              const nsACString &str)
@@ -1083,17 +1083,17 @@ calIcalComponent::AddSubcomponent(calIIc
     NS_ENSURE_SUCCESS(rv, rv);
 
     calIcalComponent * const vcal = getParentVCalendarOrThis();
     bool failed = false;
     for (PRUint32 i = 0; i < tzCount; i++) {
         if (!failed) {
             rv = vcal->AddTimezoneReference(timezones[i]);
             if (NS_FAILED(rv))
-                failed = PR_TRUE;
+                failed = true;
         }
 
         NS_RELEASE(timezones[i]);
     }
 
     nsMemory::Free(timezones);
 
     if (failed)

--- a/calendar/base/src/calPeriod.cpp
+++ b/calendar/base/src/calPeriod.cpp
@@ -42,48 +42,48 @@
 #include "nsIClassInfoImpl.h"
 
 #include "calUtils.h"
 
 NS_IMPL_CLASSINFO(calPeriod, NULL, 0, CAL_PERIOD_CID)
 NS_IMPL_ISUPPORTS1_CI(calPeriod, calIPeriod)
 
 calPeriod::calPeriod()
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
 }
 
 calPeriod::calPeriod(const calPeriod& cpt)
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     if (cpt.mStart)
         cpt.mStart->Clone(getter_AddRefs(mStart));
     if (cpt.mEnd)
         cpt.mEnd->Clone(getter_AddRefs(mEnd));
 }
 
 calPeriod::calPeriod(struct icalperiodtype const* aPeriodPtr)
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     FromIcalPeriod(aPeriodPtr);
 }
 
 NS_IMETHODIMP
 calPeriod::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calPeriod::MakeImmutable()
 {
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calPeriod::Clone(calIPeriod **aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     calPeriod *cpt = new calPeriod(*this);

--- a/calendar/base/src/calRecurrenceDate.cpp
+++ b/calendar/base/src/calRecurrenceDate.cpp
@@ -55,18 +55,18 @@
 extern "C" {
     #include "ical.h"
 }
 
 NS_IMPL_CLASSINFO(calRecurrenceDate, NULL, 0, CAL_RECURRENCEDATE_CID)
 NS_IMPL_ISUPPORTS2_CI(calRecurrenceDate, calIRecurrenceItem, calIRecurrenceDate)
 
 calRecurrenceDate::calRecurrenceDate()
-    : mImmutable(PR_FALSE),
-      mIsNegative(PR_FALSE)
+    : mImmutable(false),
+      mIsNegative(false)
 {
 }
 
 NS_IMETHODIMP
 calRecurrenceDate::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
@@ -75,17 +75,17 @@ calRecurrenceDate::GetIsMutable(bool *aR
 }
 
 NS_IMETHODIMP
 calRecurrenceDate::MakeImmutable()
 {
     if (mImmutable)
         return NS_ERROR_FAILURE; // XXX another error code
 
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDate::Clone(calIRecurrenceItem **_retval)
 {
     calRecurrenceDate *crd = new calRecurrenceDate;
     if (!crd)
@@ -121,17 +121,17 @@ calRecurrenceDate::SetIsNegative(bool aI
     return NS_OK;
 }
 
 /* readonly attribute boolean isFinite; */
 NS_IMETHODIMP
 calRecurrenceDate::GetIsFinite(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDate::GetDate(calIDateTime **aDate)
 {
     NS_ENSURE_ARG_POINTER(aDate);
 
@@ -221,24 +221,24 @@ calRecurrenceDate::SetIcalProperty(calII
 {
     NS_ENSURE_ARG_POINTER(aProp);
 
     nsCAutoString name;
     nsresult rc = aProp->GetPropertyName(name);
     if (NS_FAILED(rc))
         return rc;
     if (name.EqualsLiteral("RDATE")) {
-        mIsNegative = PR_FALSE;
+        mIsNegative = false;
         icalvalue * const value = icalproperty_get_value(aProp->GetIcalProperty());
         if (icalvalue_isa(value) == ICAL_PERIOD_VALUE) {
             icalperiodtype const period = icalvalue_get_period(value);
             // take only period's start date and skip end date, but continue parsing;
             // open bug 489747:
             mDate = new calDateTime(&period.start, nsnull /* detect timezone */);
             return NS_OK;
         }
     } else if (name.EqualsLiteral("EXDATE"))
-        mIsNegative = PR_TRUE;
+        mIsNegative = true;
     else
         return NS_ERROR_INVALID_ARG;
 
     return aProp->GetValueAsDatetime(getter_AddRefs(mDate));
 }

--- a/calendar/base/src/calRecurrenceDateSet.cpp
+++ b/calendar/base/src/calRecurrenceDateSet.cpp
@@ -50,19 +50,19 @@
 extern "C" {
     #include "ical.h"
 }
 
 NS_IMPL_CLASSINFO(calRecurrenceDateSet, NULL, 0, CAL_RECURRENCEDATESET_CID)
 NS_IMPL_ISUPPORTS2_CI(calRecurrenceDateSet, calIRecurrenceItem, calIRecurrenceDateSet)
 
 calRecurrenceDateSet::calRecurrenceDateSet()
-    : mImmutable(PR_FALSE),
-      mIsNegative(PR_FALSE),
-      mSorted(PR_FALSE)
+    : mImmutable(false),
+      mIsNegative(false),
+      mSorted(false)
 {
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
@@ -71,17 +71,17 @@ calRecurrenceDateSet::GetIsMutable(bool 
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::MakeImmutable()
 {
     if (mImmutable)
         return NS_ERROR_FAILURE; // XXX another error code
 
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::Clone(calIRecurrenceItem **_retval)
 {
     nsresult rv;
 
@@ -125,17 +125,17 @@ calRecurrenceDateSet::SetIsNegative(bool
     return NS_OK;
 }
 
 /* readonly attribute boolean isFinite; */
 NS_IMETHODIMP
 calRecurrenceDateSet::GetIsFinite(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::GetDates(PRUint32 *aCount, calIDateTime ***aDates)
 {
     if (mDates.Count() == 0) {
         *aDates = nsnull;
@@ -164,29 +164,29 @@ calRecurrenceDateSet::SetDates(PRUint32 
 {
     NS_ENSURE_ARG_POINTER(aDates);
 
     mDates.Clear();
     for (PRUint32 i = 0; i < aCount; i++) {
         mDates.AppendObject(aDates[i]);
     }
 
-    mSorted = PR_FALSE;
+    mSorted = false;
 
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::AddDate(calIDateTime *aDate)
 {
     NS_ENSURE_ARG_POINTER(aDate);
 
     mDates.AppendObject(aDate);
 
-    mSorted = PR_FALSE;
+    mSorted = false;
 
     return NS_OK;
 }
 
 static int
 calDateTimeComparator (calIDateTime *aElement1,
                        calIDateTime *aElement2,
                        void *aData)
@@ -196,17 +196,17 @@ calDateTimeComparator (calIDateTime *aEl
     return result;
 }
 
 void
 calRecurrenceDateSet::EnsureSorted()
 {
     if (!mSorted) {
         mDates.Sort(calDateTimeComparator, nsnull);
-        mSorted = PR_TRUE;
+        mSorted = true;
     }
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::GetNextOccurrence(calIDateTime *aStartTime,
                                         calIDateTime *aOccurrenceTime,
                                         calIDateTime **_retval)
 {

--- a/calendar/base/src/calRecurrenceRule.cpp
+++ b/calendar/base/src/calRecurrenceRule.cpp
@@ -50,35 +50,35 @@
 #include "nsIClassInfoImpl.h"
 
 #include <climits>
 
 NS_IMPL_CLASSINFO(calRecurrenceRule, NULL, 0, CAL_RECURRENCERULE_CID)
 NS_IMPL_ISUPPORTS2_CI(calRecurrenceRule, calIRecurrenceItem, calIRecurrenceRule)
 
 calRecurrenceRule::calRecurrenceRule()
-    : mImmutable(PR_FALSE),
-      mIsNegative(PR_FALSE),
-      mIsByCount(PR_FALSE)
+    : mImmutable(false),
+      mIsNegative(false),
+      mIsByCount(false)
 {
     icalrecurrencetype_clear(&mIcalRecur);
 }
 
 NS_IMETHODIMP
 calRecurrenceRule::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceRule::MakeImmutable()
 {
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceRule::Clone(calIRecurrenceItem **aResult)
 {
     calRecurrenceRule * const crc = new calRecurrenceRule();
     CAL_ENSURE_MEMORY(crc);
@@ -113,19 +113,19 @@ calRecurrenceRule::SetIsNegative(bool aI
 NS_IMETHODIMP
 calRecurrenceRule::GetIsFinite(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
 
     if ((mIsByCount && mIcalRecur.count == 0) ||
         (!mIsByCount && icaltime_is_null_time(mIcalRecur.until)))
     {
-        *_retval = PR_FALSE;
+        *_retval = false;
     } else {
-        *_retval = PR_TRUE;
+        *_retval = true;
     }
     return NS_OK;
 }
 
 /* attribute long type; */
 NS_IMETHODIMP
 calRecurrenceRule::GetType(nsACString &aType)
 {
@@ -197,17 +197,17 @@ calRecurrenceRule::SetCount(PRInt32 aRec
             return NS_ERROR_ILLEGAL_VALUE;
         mIcalRecur.count = static_cast<int>(aRecurCount);
     } else {
         mIcalRecur.count = 0;
     }
 
     mIcalRecur.until = icaltime_null_time();
 
-    mIsByCount = PR_TRUE;
+    mIsByCount = true;
 
     return NS_OK;
 }
 
 /* attribute calIDateTime untilDate; */
 NS_IMETHODIMP
 calRecurrenceRule::GetUntilDate(calIDateTime * *aRecurEnd)
 {
@@ -245,17 +245,17 @@ calRecurrenceRule::SetUntilDate(calIDate
 
         mIcalRecur.until = itt;
     } else {
         mIcalRecur.until = icaltime_null_time();
     }
 
     mIcalRecur.count = 0;
 
-    mIsByCount = PR_FALSE;
+    mIsByCount = false;
 
     return NS_OK;
 }
 
 /* readonly attribute boolean isByCount; */
 NS_IMETHODIMP
 calRecurrenceRule::GetIsByCount (bool *aIsByCount)
 {
@@ -549,19 +549,19 @@ calRecurrenceRule::SetIcalProperty(calII
 
     if (mImmutable)
         return NS_ERROR_OBJECT_IS_IMMUTABLE;
 
     nsCAutoString propname;
     nsresult rv = aProp->GetPropertyName(propname);
     NS_ENSURE_SUCCESS(rv, rv);
     if (propname.EqualsLiteral("RRULE"))
-        mIsNegative = PR_FALSE;
+        mIsNegative = false;
     else if (propname.EqualsLiteral("EXRULE"))
-        mIsNegative = PR_TRUE;
+        mIsNegative = true;
     else
         return NS_ERROR_INVALID_ARG;
 
     icalproperty *prop;
     struct icalrecurrencetype icalrecur;
 
     prop = aProp->GetIcalProperty();
 
@@ -573,16 +573,16 @@ calRecurrenceRule::SetIcalProperty(calII
     // event that start at different times (e.g. every day starting on
     // jan 1 for 2 weeks, every other day starting on feb 1 for 2
     // weeks).  Neither the server nor the UI supports this now,
     // but we really ought to!
     //struct icaltimetype icaldtstart;
     //icaldtstrat = icalproperty_get_dtstart(prop);
 
     if (icalrecur.count != 0)
-        mIsByCount = PR_TRUE;
+        mIsByCount = true;
     else
-        mIsByCount = PR_FALSE;
+        mIsByCount = false;
 
     mIcalRecur = icalrecur;
 
     return NS_OK;
 }

--- a/calendar/base/src/calTimezone.cpp
+++ b/calendar/base/src/calTimezone.cpp
@@ -41,42 +41,42 @@
 NS_IMPL_ISUPPORTS1(calTimezone, calITimezone)
 
 CAL_ISUPPORTS_ATTR_GETTER(calTimezone, calIIcalComponent, IcalComponent)
 CAL_STRINGTYPE_ATTR_GETTER(calTimezone, nsACString, Tzid)
 
 NS_IMETHODIMP
 calTimezone::GetIsFloating(bool * _retval) {
     NS_ENSURE_ARG_POINTER(_retval);
-    *_retval = PR_FALSE;
+    *_retval = false;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetIsUTC(bool * _retval) {
     NS_ENSURE_ARG_POINTER(_retval);
-    *_retval = PR_FALSE;
+    *_retval = false;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetDisplayName(nsAString & _retval) {
     _retval = NS_ConvertUTF8toUTF16(mTzid);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetLatitude(nsACString & _retval) {
-    _retval.SetIsVoid(PR_TRUE);
+    _retval.SetIsVoid(true);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetLongitude(nsACString & _retval) {
-    _retval.SetIsVoid(PR_TRUE);
+    _retval.SetIsVoid(true);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetProvider(calITimezoneProvider ** _retval) {
     NS_ENSURE_ARG_POINTER(_retval);
     *_retval = nsnull;
     return NS_OK;

--- a/db/mork/src/morkBuilder.cpp
+++ b/db/mork/src/morkBuilder.cpp
@@ -847,17 +847,17 @@ morkBuilder::OnValue(morkEnv* ev, const 
   if ( cell )
   {
     mdbYarn yarn;
     yarn.mYarn_Buf = inBuf.mBuf_Body;
     yarn.mYarn_Fill = yarn.mYarn_Size = inBuf.mBuf_Fill;
     yarn.mYarn_More = 0;
     yarn.mYarn_Form = mBuilder_CellForm;
     yarn.mYarn_Grow = 0;
-    morkAtom* atom = store->YarnToAtom(ev, &yarn, PR_TRUE /* create */);
+    morkAtom* atom = store->YarnToAtom(ev, &yarn, true /* create */);
     cell->SetAtom(ev, atom, store->StorePool());
   }
   else if ( mParser_InMeta )
   {
     mork_token* metaSlot = mBuilder_MetaTokenSlot;
     if ( metaSlot )
     {
       if ( metaSlot == &mBuilder_TableStatus ) // table status?

--- a/db/mork/src/morkCell.cpp
+++ b/db/mork/src/morkCell.cpp
@@ -63,17 +63,17 @@
 #include "morkCell.h"
 #endif
 
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789
 
 void
 morkCell::SetYarn(morkEnv* ev, const mdbYarn* inYarn, morkStore* ioStore)
 {
-  morkAtom* atom = ioStore->YarnToAtom(ev, inYarn, PR_TRUE /* create */);
+  morkAtom* atom = ioStore->YarnToAtom(ev, inYarn, true /* create */);
   if ( atom )
     this->SetAtom(ev, atom, ioStore->StorePool()); // refcounts atom
 }
 
 void
 morkCell::GetYarn(morkEnv* ev, mdbYarn* outYarn) const
 {
   MORK_USED_1(ev);

--- a/db/mork/src/morkCellObject.cpp
+++ b/db/mork/src/morkCellObject.cpp
@@ -300,37 +300,37 @@ morkCellObject::CanUseCell(nsIMdbEnv* me
   
   return outEnv;
 }
 
 // { ----- begin attribute methods -----
 NS_IMETHODIMP morkCellObject::SetBlob(nsIMdbEnv* /* mev */,
   nsIMdbBlob* /* ioBlob */)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 } // reads inBlob slots
 
 // when inBlob is in the same suite, this might be fastest cell-to-cell
 
 NS_IMETHODIMP morkCellObject::ClearBlob( // make empty (so content has zero length)
   nsIMdbEnv*  /* mev */)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember row->MaybeDirtySpaceStoreAndRow();
 }
 // clearing a yarn is like SetYarn() with empty yarn instance content
 
 NS_IMETHODIMP morkCellObject::GetBlobFill(nsIMdbEnv* mev,
   mdb_fill* outFill)
 // Same value that would be put into mYarn_Fill, if one called GetYarn()
 // with a yarn instance that had mYarn_Buf==nil and mYarn_Size==0.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }  // size of blob 
 
 NS_IMETHODIMP morkCellObject::SetYarn(nsIMdbEnv* mev, 
   const mdbYarn* inYarn)
 {
   mdb_err outErr = 0;
   morkCell* cell = 0;
@@ -398,17 +398,17 @@ NS_IMETHODIMP morkCellObject::AliasYarn(
 
 // } ===== end nsIMdbBlob methods =====
 
 // { ===== begin nsIMdbCell methods =====
 
 // { ----- begin attribute methods -----
 NS_IMETHODIMP morkCellObject::SetColumn(nsIMdbEnv* mev, mdb_column inColumn)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember row->MaybeDirtySpaceStoreAndRow();
 } 
 
 NS_IMETHODIMP morkCellObject::GetColumn(nsIMdbEnv* mev, mdb_column* outColumn)
 {
   mdb_err outErr = 0;
   mdb_column col = 0;
@@ -429,17 +429,17 @@ NS_IMETHODIMP morkCellObject::GetCellInf
   nsIMdbEnv* mev, 
   mdb_column* outColumn,           // the column in the containing row
   mdb_fill*   outBlobFill,         // the size of text content in bytes
   mdbOid*     outChildOid,         // oid of possible row or table child
   mdb_bool*   outIsRowChild)  // nonzero if child, and a row child
 // Checking all cell metainfo is a good way to avoid forcing a large cell
 // in to memory when you don't actually want to use the content.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
 NS_IMETHODIMP morkCellObject::GetRow(nsIMdbEnv* mev, // parent row for this cell
   nsIMdbRow** acqRow)
 {
   mdb_err outErr = 0;
@@ -516,52 +516,52 @@ NS_IMETHODIMP morkCellObject::HasAnyChil
   return outErr;
 }
 
 NS_IMETHODIMP morkCellObject::GetAnyChild( // access table of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbRow** acqRow, // child row (or null)
   nsIMdbTable** acqTable) // child table (or null)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
 NS_IMETHODIMP morkCellObject::SetChildRow( // access table of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbRow* ioRow)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 } // inRow must be bound inside this same db port
 
 NS_IMETHODIMP morkCellObject::GetChildRow( // access row of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbRow** acqRow) // acquire child row (or nil if no child)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
 NS_IMETHODIMP morkCellObject::SetChildTable( // access table of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbTable* inTable) // table must be bound inside this same db port
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember row->MaybeDirtySpaceStoreAndRow();
 }
 
 NS_IMETHODIMP morkCellObject::GetChildTable( // access table of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbTable** acqTable) // acquire child tabdle (or nil if no chil)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end children methods -----
 
 // } ===== end nsIMdbCell methods =====
 
 
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789

--- a/db/mork/src/morkCursor.cpp
+++ b/db/mork/src/morkCursor.cpp
@@ -170,49 +170,49 @@ morkCursor::IsFrozenMdbObject(nsIMdbEnv*
   return NS_OK;
 }
 // } ===== end morkNode methods =====
 // ````` ````` ````` ````` ````` 
 
 NS_IMETHODIMP
 morkCursor::GetCount(nsIMdbEnv* mev, mdb_count* outCount)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::GetSeed(nsIMdbEnv* mev, mdb_seed* outSeed)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::SetPos(nsIMdbEnv* mev, mdb_pos inPos)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::GetPos(nsIMdbEnv* mev, mdb_pos* outPos)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::SetDoFailOnSeedOutOfSync(nsIMdbEnv* mev, mdb_bool inFail)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::GetDoFailOnSeedOutOfSync(nsIMdbEnv* mev, mdb_bool* outFail)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789

--- a/db/mork/src/morkFactory.cpp
+++ b/db/mork/src/morkFactory.cpp
@@ -320,27 +320,27 @@ morkFactory::MakeHeap(nsIMdbEnv* mev, ns
   return outErr;
 }
 // } ----- end heap methods -----
 
 // { ----- begin compare methods -----
 NS_IMETHODIMP
 morkFactory::MakeCompare(nsIMdbEnv* mev, nsIMdbCompare** acqCompare)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end compare methods -----
 
 // { ----- begin row methods -----
 NS_IMETHODIMP
 morkFactory::MakeRow(nsIMdbEnv* mev, nsIMdbHeap* ioHeap,
   nsIMdbRow** acqRow)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // ioHeap can be nil, causing the heap associated with ev to be used
 // } ----- end row methods -----
 
 // { ----- begin port methods -----
 NS_IMETHODIMP
 morkFactory::CanOpenFilePort(
@@ -380,17 +380,17 @@ NS_IMETHODIMP
 morkFactory::OpenFilePort(
   nsIMdbEnv* mev, // context
   nsIMdbHeap* ioHeap, // can be nil to cause ev's heap attribute to be used
   // const char* inFilePath, // the file to open for readonly import
   nsIMdbFile* ioFile, // db abstract file interface
   const mdbOpenPolicy* inOpenPolicy, // runtime policies for using db
   nsIMdbThumb** acqThumb)
 {
-  NS_ASSERTION(PR_FALSE, "this doesn't look implemented");
+  NS_ASSERTION(false, "this doesn't look implemented");
   MORK_USED_1(ioHeap);
   mdb_err outErr = 0;
   nsIMdbThumb* outThumb = 0;
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
    if ( ev )
   {
     if ( ioFile && inOpenPolicy && acqThumb )
     {

--- a/db/mork/src/morkPortTableCursor.cpp
+++ b/db/mork/src/morkPortTableCursor.cpp
@@ -346,17 +346,17 @@ morkPortTableCursor::NextTable(morkEnv* 
 // { ----- begin table iteration methods -----
 
 // { ===== begin nsIMdbPortTableCursor methods =====
 
 // { ----- begin attribute methods -----
 NS_IMETHODIMP
 morkPortTableCursor::SetPort(nsIMdbEnv* mev, nsIMdbPort* ioPort)
 {
-  NS_ASSERTION(PR_FALSE,"not implemented");
+  NS_ASSERTION(false,"not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkPortTableCursor::GetPort(nsIMdbEnv* mev, nsIMdbPort** acqPort)
 {
   mdb_err outErr = 0;
   nsIMdbPort* outPort = 0;

--- a/db/mork/src/morkRow.cpp
+++ b/db/mork/src/morkRow.cpp
@@ -885,17 +885,17 @@ void morkRow::AddColumn(morkEnv* ev, mdb
     morkCell* oldCell = cell; // need to know later whether new
     if ( !cell ) // column does not yet exist?
       cell = this->NewCell(ev, inColumn, &pos, ioStore);
     
     if ( cell )
     {
       morkAtom* oldAtom = cell->mCell_Atom;
 
-      morkAtom* atom = ioStore->YarnToAtom(ev, inYarn, PR_TRUE /* create */);
+      morkAtom* atom = ioStore->YarnToAtom(ev, inYarn, true /* create */);
       if ( atom && atom != oldAtom )
       {
         morkRowSpace* rowSpace = mRow_Space;
         morkAtomRowMap* map = ( rowSpace->mRowSpace_IndexCount )?
           rowSpace->FindMap(ev, inColumn) : (morkAtomRowMap*) 0;
         
         if ( map ) // inColumn is indexed by row space?
         {

--- a/db/mork/src/morkRowCellCursor.cpp
+++ b/db/mork/src/morkRowCellCursor.cpp
@@ -259,17 +259,17 @@ morkRowCellCursor::MakeCell( // get cell
 // { ----- begin cell seeking methods -----
 NS_IMETHODIMP
 morkRowCellCursor::SeekCell( // same as SetRow() followed by MakeCell()
   nsIMdbEnv* mev, // context
   mdb_pos inPos, // position of cell in row sequence
   mdb_column* outColumn, // column for this particular cell
   nsIMdbCell** acqCell)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end cell seeking methods -----
 
 // { ----- begin cell iteration methods -----
 NS_IMETHODIMP
 morkRowCellCursor::NextCell( // get next cell in the row
   nsIMdbEnv* mev, // context
@@ -311,16 +311,16 @@ morkRowCellCursor::PickNextCell( // get 
   nsIMdbCell* ioCell, // changes to the next cell in the iteration
   const mdbColumnSet* inFilterSet, // col set of actual caller interest
   mdb_column* outColumn, // column for this particular cell
   mdb_pos* outPos)
 // Note that inFilterSet should not have too many (many more than 10?)
 // cols, since this might imply a potential excessive consumption of time
 // over many cursor calls when looking for column and filter intersection.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 // } ----- end cell iteration methods -----
 
 // } ===== end nsIMdbRowCellCursor methods =====
 

--- a/db/mork/src/morkRowObject.cpp
+++ b/db/mork/src/morkRowObject.cpp
@@ -197,28 +197,28 @@ morkRowObject::GetOid(nsIMdbEnv* mev,
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
   return (ev) ? ev->AsErr() : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
 morkRowObject::BecomeContent(nsIMdbEnv* mev,
   const mdbOid* inOid)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember row->MaybeDirtySpaceStoreAndRow();
 }
 // } ----- end ID methods -----
 
 // { ----- begin activity dropping methods -----
 NS_IMETHODIMP
 morkRowObject::DropActivity( // tell collection usage no longer expected
   nsIMdbEnv* mev)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end activity dropping methods -----
 
 // } ===== end nsIMdbCollection methods =====
 
 // { ===== begin nsIMdbRow methods =====
 

--- a/db/mork/src/morkRowSpace.cpp
+++ b/db/mork/src/morkRowSpace.cpp
@@ -551,18 +551,18 @@ morkRowSpace::FindMap(morkEnv* ev, mork_
 }
 
 morkRow*
 morkRowSpace::FindRow(morkEnv* ev, mork_column inCol, const mdbYarn* inYarn)
 {
   morkRow* outRow = 0;
 
   // if yarn hasn't been atomized, there can't be a corresponding row,
-  // so pass in PR_FALSE to not create the row - should help history bloat
-  morkAtom* atom = mSpace_Store->YarnToAtom(ev, inYarn, PR_FALSE);
+  // so pass in false to not create the row - should help history bloat
+  morkAtom* atom = mSpace_Store->YarnToAtom(ev, inYarn, false);
   if ( atom ) // have or created an atom corresponding to input yarn?
   {
     mork_aid atomAid = atom->GetBookAtomAid();
     if ( atomAid ) // atom has an identity for use in hash table?
     {
       morkAtomRowMap* map = this->ForceMap(ev, inCol);
       if ( map ) // able to find or create index for col?
       {

--- a/db/mork/src/morkStore.cpp
+++ b/db/mork/src/morkStore.cpp
@@ -694,17 +694,17 @@ morkAtom*
 morkStore::CopyAtom(morkEnv* ev, const morkAtom* inAtom)
 // copy inAtom (from some other store) over to this store
 {
   morkAtom* outAtom = 0;
   if ( inAtom )
   {
     mdbYarn yarn;
     if ( inAtom->AliasYarn(&yarn) )
-      outAtom = this->YarnToAtom(ev, &yarn, PR_TRUE /* create */);
+      outAtom = this->YarnToAtom(ev, &yarn, true /* create */);
   }
   return outAtom;
 }
  
 morkAtom*
 morkStore::YarnToAtom(morkEnv* ev, const mdbYarn* inYarn, bool createIfMissing /* = true */)
 {
   morkAtom* outAtom = 0;
@@ -2060,37 +2060,37 @@ morkStore::NewTableWithOid( // make one 
 
 // { ----- begin row scope methods -----
 NS_IMETHODIMP
 morkStore::RowScopeHasAssignedIds(nsIMdbEnv* mev,
   mdb_scope inRowScope,   // row scope for row ids
   mdb_bool* outCallerAssigned, // nonzero if caller assigned specified
   mdb_bool* outStoreAssigned) // nonzero if store db assigned specified
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkStore::SetCallerAssignedIds(nsIMdbEnv* mev,
   mdb_scope inRowScope,   // row scope for row ids
   mdb_bool* outCallerAssigned, // nonzero if caller assigned specified
   mdb_bool* outStoreAssigned) // nonzero if store db assigned specified
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkStore::SetStoreAssignedIds(nsIMdbEnv* mev,
   mdb_scope inRowScope,   // row scope for row ids
   mdb_bool* outCallerAssigned, // nonzero if caller assigned specified
   mdb_bool* outStoreAssigned) // nonzero if store db assigned specified
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end row scope methods -----
 
 // { ----- begin row methods -----
 NS_IMETHODIMP
 morkStore::NewRowWithOid(nsIMdbEnv* mev, // new row w/ caller assigned oid
   const mdbOid* inOid,   // caller assigned oid
@@ -2141,29 +2141,29 @@ NS_IMETHODIMP
 morkStore::ImportContent( // import content from port
   nsIMdbEnv* mev, // context
   mdb_scope inRowScope, // scope for rows (or zero for all?)
   nsIMdbPort* ioPort, // the port with content to add to store
   nsIMdbThumb** acqThumb) // acquire thumb for incremental import
 // Call nsIMdbThumb::DoMore() until done, or until the thumb is broken, and
 // then the import will be finished.
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkStore::ImportFile( // import content from port
   nsIMdbEnv* mev, // context
   nsIMdbFile* ioFile, // the file with content to add to store
   nsIMdbThumb** acqThumb) // acquire thumb for incremental import
 // Call nsIMdbThumb::DoMore() until done, or until the thumb is broken, and
 // then the import will be finished.
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end inport/export methods -----
 
 // { ----- begin hinting methods -----
 NS_IMETHODIMP
 morkStore::ShareAtomColumnsHint( // advise re shared col content atomizing
   nsIMdbEnv* mev, // context

--- a/db/mork/src/morkTable.cpp
+++ b/db/mork/src/morkTable.cpp
@@ -259,29 +259,29 @@ morkTable::GetOid(nsIMdbEnv* mev,
   GetTableOid(ev, outOid);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 morkTable::BecomeContent(nsIMdbEnv* mev,
   const mdbOid* inOid) // exchange content
 {
-  NS_ASSERTION(PR_FALSE, "not implemented"); 
+  NS_ASSERTION(false, "not implemented"); 
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember table->MaybeDirtySpaceStoreAndTable();
 }
 
 // } ----- end ID methods -----
 
 // { ----- begin activity dropping methods -----
 NS_IMETHODIMP
 morkTable::DropActivity( // tell collection usage no longer expected
   nsIMdbEnv* mev)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented"); 
+  NS_ASSERTION(false, "not implemented"); 
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 // } ----- end activity dropping methods -----
 
 // } ===== end nsIMdbCollection methods =====
 
 // { ===== begin nsIMdbTable methods =====
@@ -564,17 +564,17 @@ morkTable::RowToPos( // test for the tab
 // } ----- end row position methods -----
 
 // { ----- begin oid set methods -----
 NS_IMETHODIMP
 morkTable::AddOid( // make sure the row with inOid is a table member 
   nsIMdbEnv* mev, // context
   const mdbOid* inOid) // row to ensure membership in table
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::HasOid( // test for the table position of a row member
   nsIMdbEnv* mev, // context
   const mdbOid* inOid, // row to find in table
   mdb_bool* outHasOid) // whether inOid is a member row
@@ -718,17 +718,17 @@ morkTable::CutAllRows( // remove all row
 
 // { ----- begin searching methods -----
 NS_IMETHODIMP
 morkTable::FindRowMatches( // search variable number of sorted cols
   nsIMdbEnv* mev, // context
   const mdbYarn* inPrefix, // content to find as prefix in row's column cell
   nsIMdbTableRowCursor** acqCursor) // set of matching rows
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
   
 NS_IMETHODIMP
 morkTable::GetSearchColumns( // query columns used by FindRowMatches()
   nsIMdbEnv* mev, // context
   mdb_count* outCount, // context
   mdbColumnSet* outColSet) // caller supplied space to put columns
@@ -740,37 +740,37 @@ morkTable::GetSearchColumns( // query co
   // the outCount parameter; if this number exceeds mColumnSet_Count,
   // then a caller needs a bigger array to read the entire column set.
   // The minimum of mColumnSet_Count and outCount is the number slots
   // in mColumnSet_Columns that were actually written by this method.
   //
   // Callers are expected to change this set of columns by calls to
   // nsIMdbTable::SearchColumnsHint() or SetSearchSorting(), or both.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end searching methods -----
 
 // { ----- begin hinting methods -----
 NS_IMETHODIMP
 morkTable::SearchColumnsHint( // advise re future expected search cols  
   nsIMdbEnv* mev, // context
   const mdbColumnSet* inColumnSet) // columns likely to be searched
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
   
 NS_IMETHODIMP
 morkTable::SortColumnsHint( // advise re future expected sort columns  
   nsIMdbEnv* mev, // context
   const mdbColumnSet* inColumnSet) // columns for likely sort requests
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::StartBatchChangeHint( // advise before many adds and cuts  
   nsIMdbEnv* mev, // context
   const void* inLabel) // intend unique address to match end call
   // If batch starts nest by virtue of nesting calls in the stack, then
@@ -805,27 +805,27 @@ morkTable::EndBatchChangeHint( // advise
 // sort following the primary column sort, when table rows are sorted.
 
 NS_IMETHODIMP
 morkTable::CanSortColumn( // query which column is currently used for sorting
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // column to query sorting potential
   mdb_bool* outCanSort) // whether the column can be sorted
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::GetSorting( // view same table in particular sorting
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // requested new column for sorting table
   nsIMdbSorting** acqSorting) // acquire sorting for column
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::SetSearchSorting( // use this sorting in FindRowMatches()
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // often same as nsIMdbSorting::GetSortColumn()
   nsIMdbSorting* ioSorting) // requested sorting for some column
@@ -847,17 +847,17 @@ morkTable::SetSearchSorting( // use this
   // column inColumn no longer be used at all by FindRowMatches().
   // But when ioSorting is non-nil, then inColumn should match the
   // column actually sorted by ioSorting; when these do not agree,
   // implementations are instructed to give precedence to the column
   // specified by ioSorting (so this means callers might just pass
   // zero for inColumn when ioSorting is also provided, since then
   // inColumn is both redundant and ignored).
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 // } ----- end sorting methods -----
 
 // { ----- begin moving methods -----
 // moving a row does nothing unless a table is currently unsorted
 
@@ -918,67 +918,67 @@ morkTable::MoveRow( // change position o
 NS_IMETHODIMP
 morkTable::AddIndex( // create a sorting index for column if possible
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // the column to sort by index
   nsIMdbThumb** acqThumb) // acquire thumb for incremental index building
 // Call nsIMdbThumb::DoMore() until done, or until the thumb is broken, and
 // then the index addition will be finished.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::CutIndex( // stop supporting a specific column index
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // the column with index to be removed
   nsIMdbThumb** acqThumb) // acquire thumb for incremental index destroy
 // Call nsIMdbThumb::DoMore() until done, or until the thumb is broken, and
 // then the index removal will be finished.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::HasIndex( // query for current presence of a column index
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // the column to investigate
   mdb_bool* outHasIndex) // whether column has index for this column
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::EnableIndexOnSort( // create an index for col on first sort
   nsIMdbEnv* mev, // context
   mdb_column inColumn) // the column to index if ever sorted
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::QueryIndexOnSort( // check whether index on sort is enabled
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // the column to investigate
   mdb_bool* outIndexOnSort) // whether column has index-on-sort enabled
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::DisableIndexOnSort( // prevent future index creation on sort
   nsIMdbEnv* mev, // context
   mdb_column inColumn) // the column to index if ever sorted
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end index methods -----
 
 // } ===== end nsIMdbTable methods =====
 
 // we override these so that we'll use the xpcom add and release ref.
 mork_refs

--- a/db/mork/src/morkTableRowCursor.cpp
+++ b/db/mork/src/morkTableRowCursor.cpp
@@ -155,17 +155,17 @@ morkTableRowCursor::GetCount(nsIMdbEnv* 
   if ( outCount )
     *outCount = count;
   return outErr;
 }
 
 /*virtual*/ mdb_err
 morkTableRowCursor::GetSeed(nsIMdbEnv* mev, mdb_seed* outSeed)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /*virtual*/ mdb_err
 morkTableRowCursor::SetPos(nsIMdbEnv* mev, mdb_pos inPos)
 {
   mCursor_Pos = inPos;
   return NS_OK;

--- a/ldap/xpcom/src/nsLDAPConnection.cpp
+++ b/ldap/xpcom/src/nsLDAPConnection.cpp
@@ -66,17 +66,17 @@
 
 const char kConsoleServiceContractId[] = "@mozilla.org/consoleservice;1";
 const char kDNSServiceContractId[] = "@mozilla.org/network/dns-service;1";
 
 // constructor
 //
 nsLDAPConnection::nsLDAPConnection()
     : mConnectionHandle(0),
-      mSSL(PR_FALSE),
+      mSSL(false),
       mVersion(nsILDAPConnection::VERSION3),
       mDNSRequest(0)
 {
 }
 
 // destructor
 //
 nsLDAPConnection::~nsLDAPConnection()
@@ -113,17 +113,17 @@ nsLDAPConnection::Init(nsILDAPURL *aUrl,
   NS_ENSURE_ARG_POINTER(aUrl);
   NS_ENSURE_ARG_POINTER(aMessageListener);
 
   nsresult rv;
   nsCOMPtr<nsIObserverService> obsServ =
         do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
   // We have to abort all LDAP pending operation before shutdown.
-  obsServ->AddObserver(this, "profile-change-net-teardown", PR_TRUE);
+  obsServ->AddObserver(this, "profile-change-net-teardown", true);
 
   // Save various items that we'll use later
   mBindName.Assign(aBindName);
   mClosure = aClosure;
   mInitListener = aMessageListener;
 
   // Make sure we haven't called Init earlier, i.e. there's a DNS
   // request pending.
@@ -701,17 +701,17 @@ NS_IMETHODIMP nsLDAPConnectionRunnable::
       return thread->Dispatch(this, nsIEventTarget::DISPATCH_NORMAL);
     case -1:
       NS_ERROR("We don't know what went wrong with the ldap operation");
       return NS_ERROR_FAILURE;
 
     case LDAP_RES_SEARCH_ENTRY:
     case LDAP_RES_SEARCH_REFERENCE:
       // XXX what should we do with LDAP_RES_SEARCH_EXTENDED
-      operationFinished = PR_FALSE;
+      operationFinished = false;
     default:
     {
       msg = new nsLDAPMessage;
       if (!msg)
         return NS_ERROR_NULL_POINTER;
 
       // initialize the message, using a protected method not available
       // through nsILDAPMessage (which is why we need the raw pointer)

--- a/ldap/xpcom/src/nsLDAPControl.cpp
+++ b/ldap/xpcom/src/nsLDAPControl.cpp
@@ -40,17 +40,17 @@
 #include "nsLDAPControl.h"
 #include "prmem.h"
 #include "plstr.h"
 #include "nsLDAPBERValue.h"
 
 NS_IMPL_ISUPPORTS1(nsLDAPControl, nsILDAPControl)
 
 nsLDAPControl::nsLDAPControl()
-  : mIsCritical(PR_FALSE)
+  : mIsCritical(false)
 {
 }
 
 nsLDAPControl::~nsLDAPControl()
 {
 }
 
 /* attribute ACString oid; */

--- a/ldap/xpcom/src/nsLDAPMessage.cpp
+++ b/ldap/xpcom/src/nsLDAPMessage.cpp
@@ -317,24 +317,24 @@ nsLDAPMessage::IterateAttrErrHandler(PRI
 }
 
 
 // wrapper for ldap_first_attribute 
 //
 NS_IMETHODIMP
 nsLDAPMessage::GetAttributes(PRUint32 *aAttrCount, char** *aAttributes)
 {
-    return IterateAttributes(aAttrCount, aAttributes, PR_TRUE);
+    return IterateAttributes(aAttrCount, aAttributes, true);
 }
 
-// if getP is PR_TRUE, we get the attributes by recursing once
+// if getP is true, we get the attributes by recursing once
 // (without getP set) in order to fill in *attrCount, then allocate
 // and fill in the *aAttributes.  
 // 
-// if getP is PR_FALSE, just fill in *attrCount and return
+// if getP is false, just fill in *attrCount and return
 // 
 nsresult
 nsLDAPMessage::IterateAttributes(PRUint32 *aAttrCount, char** *aAttributes, 
                  bool getP)
 {
     BerElement *position;
     nsresult rv;
 
@@ -344,17 +344,17 @@ nsLDAPMessage::IterateAttributes(PRUint3
 
     // if we've been called from GetAttributes, recurse once in order to
     // count the elements in this message.
     //
     if (getP) {
         *aAttributes = 0;
         *aAttrCount = 0;
 
-        rv = IterateAttributes(aAttrCount, aAttributes, PR_FALSE);
+        rv = IterateAttributes(aAttrCount, aAttributes, false);
         if (NS_FAILED(rv))
             return rv;
 
         // create an array of the appropriate size
         //
         *aAttributes = static_cast<char **>(nsMemory::Alloc(*aAttrCount *
                                                       sizeof(char *)));
         if (!*aAttributes) {

--- a/ldap/xpcom/src/nsLDAPModification.cpp
+++ b/ldap/xpcom/src/nsLDAPModification.cpp
@@ -135,17 +135,17 @@ nsLDAPModification::SetValues(nsIArray* 
 
   nsCOMPtr<nsISupports> value;
 
   while (hasMoreElements)
   {
     rv = enumerator->GetNext(getter_AddRefs(value));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = mValues->AppendElement(value, PR_FALSE);
+    rv = mValues->AppendElement(value, false);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = enumerator->HasMoreElements(&hasMoreElements);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   return NS_OK;
 }
@@ -183,10 +183,10 @@ nsLDAPModification::SetUpModificationOne
 
   if (!mValues)
     mValues = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
   else
     rv = mValues->Clear();
 
   NS_ENSURE_SUCCESS(rv, rv);
   
-  return mValues->AppendElement(aValue, PR_FALSE);
+  return mValues->AppendElement(aValue, false);
 }

--- a/ldap/xpcom/src/nsLDAPService.cpp
+++ b/ldap/xpcom/src/nsLDAPService.cpp
@@ -60,28 +60,28 @@ static NS_DEFINE_CID(kLDAPOperationCID, 
 // First we provide all the methods for the "local" class
 // nsLDAPServiceEntry.
 //
 
 // constructor
 //
 nsLDAPServiceEntry::nsLDAPServiceEntry()
     : mLeases(0),
-      mDelete(PR_FALSE),
-      mRebinding(PR_FALSE)
+      mDelete(false),
+      mRebinding(false)
 
 {
     mTimestamp = LL_Zero();
 }
 
 // Init function
 //
 bool nsLDAPServiceEntry::Init()
 {
-    return PR_TRUE;
+    return true;
 }
 
 // Set/Get the timestamp when this server was last used. We might have
 // to use an "interval" here instead, see Bug #76887.
 //
 PRTime nsLDAPServiceEntry::GetTimestamp()
 {
     return mTimestamp;
@@ -97,21 +97,21 @@ void nsLDAPServiceEntry::SetTimestamp()
 //
 void nsLDAPServiceEntry::IncrementLeases()
 {
     mLeases++;
 }
 bool nsLDAPServiceEntry::DecrementLeases()
 {
     if (!mLeases) {
-        return PR_FALSE;
+        return false;
     }
     mLeases--;
 
-    return PR_TRUE;
+    return true;
 }
 PRUint32 nsLDAPServiceEntry::GetLeases()
 {
     return mLeases;
 }
 
 // Get/Set the nsLDAPServer object for this entry.
 //
@@ -120,21 +120,21 @@ already_AddRefed<nsILDAPServer> nsLDAPSe
     nsILDAPServer *server;
 
     NS_IF_ADDREF(server = mServer);
     return server;
 }
 bool nsLDAPServiceEntry::SetServer(nsILDAPServer *aServer)
 {
     if (!aServer) {
-        return PR_FALSE;
+        return false;
     }
     mServer = aServer;
 
-    return PR_TRUE;
+    return true;
 }
 
 // Get/Set/Clear the nsLDAPConnection object for this entry.
 //
 already_AddRefed<nsILDAPConnection> nsLDAPServiceEntry::GetConnection()
 {
     nsILDAPConnection *conn;
 
@@ -200,19 +200,19 @@ void nsLDAPServiceEntry::SetRebinding(bo
     mRebinding = aState;
 }
 
 // Mark a service entry for deletion, this is "dead" code right now,
 // see bug #75966.
 //
 bool nsLDAPServiceEntry::DeleteEntry()
 {
-    mDelete = PR_TRUE;
+    mDelete = true;
 
-    return PR_TRUE;
+    return true;
 }
 // This is the end of the nsLDAPServiceEntry class
 
 
 // Here begins the implementation for nsLDAPService
 // 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsLDAPService,
                               nsILDAPService,
@@ -506,30 +506,30 @@ NS_IMETHODIMP nsLDAPService::ReconnectCo
         // we be marked as finished either if there's an error condition,
         // or if the OnLDAPMessage() method gets called (i.e. bind() done).
         //
         entry->SetMessage(0);
         entry->SetConnection(0);
 
         // Get a new connection
         //
-        entry->SetRebinding(PR_TRUE);
+        entry->SetRebinding(true);
     }
 
     rv = EstablishConnection(entry, aListener);
     if (NS_FAILED(rv)) {
         return rv;
     }
 
     {
         MutexAutoLock lock(mLock);
         
         if (!entry->PushListener(static_cast<nsILDAPMessageListener *>
                                             (aListener))) {
-            entry->SetRebinding(PR_FALSE);
+            entry->SetRebinding(false);
             return NS_ERROR_FAILURE;
         }
     }
 
     return NS_OK;
 }
 
 /**
@@ -593,17 +593,17 @@ nsLDAPService::OnLDAPMessage(nsILDAPMess
 
             message = entry->GetMessage();
             if (message) {
                 // We already have a message, lets keep that one.
                 //
                 return NS_ERROR_FAILURE;
             }
 
-            entry->SetRebinding(PR_FALSE);
+            entry->SetRebinding(false);
             entry->SetMessage(aMessage);
 
             // Now process all the pending callbacks/listeners. We
             // have to make sure to unlock before calling a listener,
             // since it's likely to call back into us again.
             //
             while (listener = entry->PopListener()) {
                 MutexAutoUnlock unlock(mLock);

--- a/ldap/xpcom/src/nsLDAPSyncQuery.cpp
+++ b/ldap/xpcom/src/nsLDAPSyncQuery.cpp
@@ -48,17 +48,17 @@
 
 // nsISupports Implementation
 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsLDAPSyncQuery, nsILDAPSyncQuery, nsILDAPMessageListener)
 
 // Constructor
 //
 nsLDAPSyncQuery::nsLDAPSyncQuery() :
-    mFinished(PR_FALSE), // This is a control variable for event loop
+    mFinished(false), // This is a control variable for event loop
     mProtocolVersion(nsILDAPConnection::VERSION3)
 {
 }
 
 // Destructor
 //
 nsLDAPSyncQuery::~nsLDAPSyncQuery()
 {
@@ -355,17 +355,17 @@ nsresult nsLDAPSyncQuery::InitConnection
 }
 
 void
 nsLDAPSyncQuery::FinishLDAPQuery()
 {
     // We are done with the LDAP operation. 
     // Release the Control variable for the eventloop
     //
-    mFinished = PR_TRUE;
+    mFinished = true;
     
     // Release member variables
     //
     mConnection = 0;
     mOperation = 0;
     mServerURL = 0;
  
 }

--- a/ldap/xpcom/src/nsLDAPURL.cpp
+++ b/ldap/xpcom/src/nsLDAPURL.cpp
@@ -372,17 +372,17 @@ NS_IMETHODIMP nsLDAPURL::GetOriginCharse
 
   return mBaseURL->GetOriginCharset(result);
 }
 
 // boolean equals (in nsIURI other)
 // (based on nsSimpleURI::Equals)
 NS_IMETHODIMP nsLDAPURL::Equals(nsIURI *other, bool *_retval)
 {
-  *_retval = PR_FALSE;
+  *_retval = false;
   if (other)
   {
     nsresult rv;
     nsCOMPtr<nsILDAPURL> otherURL(do_QueryInterface(other, &rv));
     if (NS_SUCCEEDED(rv))
     {
       nsCAutoString thisSpec, otherSpec;
       PRUint32 otherOptions;
@@ -392,17 +392,17 @@ NS_IMETHODIMP nsLDAPURL::Equals(nsIURI *
 
       rv = otherURL->GetSpec(otherSpec);
       NS_ENSURE_SUCCESS(rv, rv);
 
       rv = otherURL->GetOptions(&otherOptions);
       NS_ENSURE_SUCCESS(rv, rv);
 
       if (thisSpec == otherSpec && mOptions == otherOptions)
-        *_retval = PR_TRUE;
+        *_retval = true;
     }
   }
   return NS_OK;
 }
 
 // boolean schemeIs(in const char * scheme);
 //
 NS_IMETHODIMP nsLDAPURL::SchemeIs(const char *aScheme, bool *aEquals)

--- a/ldap/xpcom/src/nsLDAPUtils.h
+++ b/ldap/xpcom/src/nsLDAPUtils.h
@@ -118,59 +118,59 @@ bool IsUTF8(const nsACString& aString)
     if (0 == state) {
 
       c = *ptr++;
 
       if ((c & 0x80) == 0x00)
         continue;
 
       if ( c <= 0xC1 ) // [80-BF] where not expected, [C0-C1] for overlong.
-        return PR_FALSE;
+        return false;
       else if ((c & 0xE0) == 0xC0)
         state = 1;
       else if ((c & 0xF0) == 0xE0) {
         state = 2;
         if ( c == 0xE0 ) { // to exclude E0[80-9F][80-BF]
-          overlong = PR_TRUE;
+          overlong = true;
           olupper = 0x9F;
         } else if ( c == 0xED ) { // ED[A0-BF][80-BF] : surrogate codepoint
-          surrogate = PR_TRUE;
+          surrogate = true;
           slower = 0xA0;
         } else if ( c == 0xEF ) // EF BF [BE-BF] : non-character
-          nonchar = PR_TRUE;
+          nonchar = true;
       } else if ( c <= 0xF4 ) { // XXX replace /w UTF8traits::is4byte when it's updated to exclude [F5-F7].(bug 199090)
         state = 3;
-        nonchar = PR_TRUE;
+        nonchar = true;
         if ( c == 0xF0 ) { // to exclude F0[80-8F][80-BF]{2}
-          overlong = PR_TRUE;
+          overlong = true;
           olupper = 0x8F;
         }
         else if ( c == 0xF4 ) { // to exclude F4[90-BF][80-BF]
           // actually not surrogates but codepoints beyond 0x10FFFF
-          surrogate = PR_TRUE;
+          surrogate = true;
           slower = 0x90;
         }
       } else
-        return PR_FALSE; // Not UTF-8 string
+        return false; // Not UTF-8 string
     }
 
     while (ptr < done_reading && state) {
       c = *ptr++;
       --state;
 
       // non-character : EF BF [BE-BF] or F[0-7] [89AB]F BF [BE-BF]
       if ( nonchar &&  ( !state &&  c < 0xBE ||
            state == 1 && c != 0xBF  ||
            state == 2 && 0x0F != (0x0F & c) ))
-        nonchar = PR_FALSE;
+        nonchar = false;
 
       if ((c & 0xC0) != 0x80 || overlong && c <= olupper ||
            surrogate && slower <= c || nonchar && !state )
-        return PR_FALSE; // Not UTF-8 string
-      overlong = surrogate = PR_FALSE;
+        return false; // Not UTF-8 string
+      overlong = surrogate = false;
     }
   }
   return !state; // state != 0 at the end indicates an invalid UTF-8 seq.
 }
 
 #define kNotFound -1
 
 #define nsCaseInsensitiveCStringComparator() \

--- a/mail/app/nsMailApp.cpp
+++ b/mail/app/nsMailApp.cpp
@@ -116,20 +116,20 @@ static const nsDynamicFunctionLoad kXULF
 };
 
 static int do_main(const char *exePath, int argc, char* argv[])
 {
   nsCOMPtr<nsILocalFile> appini;
 #ifdef XP_WIN
   // exePath comes from mozilla::BinaryPath::Get, which returns a UTF-8
   // encoded path, so it is safe to convert it
-  nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), PR_FALSE,
+  nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false,
                                 getter_AddRefs(appini));
 #else
-  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), PR_FALSE,
+  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), false,
                                       getter_AddRefs(appini));
 #endif
   if (NS_FAILED(rv)) {
     return 255;
   }
 
   appini->SetNativeLeafName(NS_LITERAL_CSTRING("application.ini"));
 

--- a/mail/components/migration/src/nsEudoraProfileMigrator.cpp
+++ b/mail/components/migration/src/nsEudoraProfileMigrator.cpp
@@ -51,17 +51,17 @@
 #include "nsIFile.h"
 
 
 NS_IMPL_ISUPPORTS2(nsEudoraProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
 
 
 nsEudoraProfileMigrator::nsEudoraProfileMigrator()
 {
-  mProcessingMailFolders = PR_FALSE;
+  mProcessingMailFolders = false;
   // get the import service
   mImportModule = do_CreateInstance("@mozilla.org/import/import-eudora;1");
 }
 
 nsEudoraProfileMigrator::~nsEudoraProfileMigrator()
 {
 }
 
@@ -135,17 +135,17 @@ nsEudoraProfileMigrator::GetMigrateData(
   *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA |
              nsIMailProfileMigrator::MAILDATA | nsIMailProfileMigrator::FILTERS;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsEudoraProfileMigrator::GetSourceExists(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = false;
 
   nsCOMPtr<nsIImportSettings> importSettings;
   mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
 
   if (importSettings)
   {
     nsString description;
     nsCOMPtr<nsIFile> location;
@@ -153,17 +153,17 @@ nsEudoraProfileMigrator::GetSourceExists
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsEudoraProfileMigrator::GetSourceHasMultipleProfiles(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsEudoraProfileMigrator::GetSourceProfiles(nsIArray** aResult)
 {
   *aResult = nsnull;
   return NS_OK;

--- a/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
+++ b/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
@@ -98,17 +98,17 @@ nsNetscapeProfileMigratorBase::GetProfil
   rv = parser.Init(profileIni);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCAutoString buffer, filePath;
   bool isRelative;
 
   // This is an infinite loop that is broken when we no longer find profiles
   // for profileID with IsRelative option.
-  for (unsigned int c = 0; PR_TRUE; ++c) {
+  for (unsigned int c = 0; true; ++c) {
     nsCAutoString profileID("Profile");
     profileID.AppendInt(c);
 
     if (NS_FAILED(parser.GetString(profileID.get(), "IsRelative", buffer)))
       break;
 
     isRelative = buffer.EqualsLiteral("1");
 
@@ -120,44 +120,44 @@ nsNetscapeProfileMigratorBase::GetProfil
 
     rv = parser.GetString(profileID.get(), "Name", buffer);
     if (NS_FAILED(rv)) {
       NS_ERROR("Malformed profiles.ini: Name= not found");
       continue;
     }
 
     nsCOMPtr<nsILocalFile> rootDir;
-    rv = NS_NewNativeLocalFile(EmptyCString(), PR_TRUE, getter_AddRefs(rootDir));
+    rv = NS_NewNativeLocalFile(EmptyCString(), true, getter_AddRefs(rootDir));
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = isRelative ? rootDir->SetRelativeDescriptor(aDataDir, filePath) :
                       rootDir->SetPersistentDescriptor(filePath);
     if (NS_FAILED(rv))
       continue;
 
     bool exists = false;
     rootDir->Exists(&exists);
 
     if (exists) {
-      aProfileLocations->AppendElement(rootDir, PR_FALSE);
+      aProfileLocations->AppendElement(rootDir, false);
 
       nsCOMPtr<nsISupportsString> profileNameString(
         do_CreateInstance("@mozilla.org/supports-string;1"));
 
       profileNameString->SetData(NS_ConvertUTF8toUTF16(buffer));
-      aProfileNames->AppendElement(profileNameString, PR_FALSE);
+      aProfileNames->AppendElement(profileNameString, false);
     }
   }
   return NS_OK;
 }
 
 #define GETPREF(xform, method, value) \
   nsresult rv = aBranch->method(xform->sourcePrefName, value); \
   if (NS_SUCCEEDED(rv)) \
-    xform->prefHasValue = PR_TRUE; \
+    xform->prefHasValue = true; \
   return rv;
 
 #define SETPREF(xform, method, value) \
   if (xform->prefHasValue) { \
     return aBranch->method(xform->targetPrefName ? xform->targetPrefName : xform->sourcePrefName, value); \
   } \
   return NS_OK;
 
@@ -222,17 +222,17 @@ nsNetscapeProfileMigratorBase::CopyFile(
     return NS_OK;
 
   nsCOMPtr<nsIFile> targetFile;
   mTargetProfile->Clone(getter_AddRefs(targetFile));
 
   targetFile->Append(aTargetFileName);
   targetFile->Exists(&exists);
   if (exists)
-    targetFile->Remove(PR_FALSE);
+    targetFile->Remove(false);
 
   return sourceFile->CopyTo(mTargetProfile, aTargetFileName);
 }
 
 nsresult
 nsNetscapeProfileMigratorBase::GetSignonFileName(bool aReplace, char** aFileName)
 {
   nsresult rv;
@@ -442,29 +442,29 @@ nsNetscapeProfileMigratorBase::GetSource
   GetSourceProfiles(getter_AddRefs(profiles));
 
   if (profiles) {
     PRUint32 count;
     profiles->GetLength(&count);
     *aResult = count > 1;
   }
   else
-    *aResult = PR_FALSE;
+    *aResult = false;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNetscapeProfileMigratorBase::GetSourceExists(bool* aResult)
 {
   nsCOMPtr<nsIArray> profiles;
   GetSourceProfiles(getter_AddRefs(profiles));
 
   if (profiles) {
     PRUint32 count;
     profiles->GetLength(&count);
     *aResult = count > 0;
   }
   else
-    *aResult = PR_FALSE;
+    *aResult = false;
 
   return NS_OK;
 }